Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 15:45:51 +0000 (08:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 19 Jul 2011 15:45:51 +0000 (08:45 -0700)

Trivial merge